# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1069.1.240 -> 1.1069.1.241
#	 arch/ia64/mm/init.c	1.7.4.5 -> 1.7.4.6
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/01/08	bjorn.helgaas@hp.com	1.1134
# Trivial hand merge
# --------------------------------------------
# 04/01/08	bjorn.helgaas@hp.com	1.1135
# Merge hp.com:/home/helgaas/linux/ia64-extras
# into hp.com:/home/helgaas/linux/linux-ia64-2.4
# --------------------------------------------
# 04/01/08	bjorn.helgaas@hp.com	1.1069.1.241
# ia64: Fix broken merge (remove mmu_gathers[] defn)
# --------------------------------------------
#
diff -Nru a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
--- a/arch/ia64/mm/init.c	Thu Jan  8 16:34:14 2004
+++ b/arch/ia64/mm/init.c	Thu Jan  8 16:34:14 2004
@@ -31,8 +31,6 @@
 #include <asm/mca.h>
 #include <asm/tlb.h>
 
-mmu_gather_t mmu_gathers[NR_CPUS];
-
 /* References to section boundaries: */
 extern char _stext, _etext, _edata, __init_begin, __init_end;